bitkeeper revision 1.1327.2.10 (426fa4e4eW-9e4FXXSNCILoSYO6KKA)

Add error handling so that disconnecting from a console
producing fast output doesn't cause an error loop.

Signed-off-by: Mike Wray <mike.wray@hp.com>

diff --git a/tools/python/xen/xend/server/console.py b/tools/python/xen/xend/server/console.py
index ac63703f210fab942f9351c865c92cc0d643e793..1cd1bb5df0592eb5ab742c6cb2dfd29a0014e832 100755 (executable)
--- a/tools/python/xen/xend/server/console.py
+++ b/tools/python/xen/xend/server/console.py
@@ -2,7 +2,8 @@
 
 import socket
 import threading
-
+from errno import EAGAIN, EINTR, EWOULDBLOCK
+    
 from xen.web import reactor, protocol
 
 from xen.lowlevel import xu
@@ -278,15 +279,20 @@ class ConsoleDev(Dev):
             self.lock.acquire()
             if self.closed():
                 return -1
-            if not self.conn:
-                return 0
-            while not self.obuf.empty():
+            writes = 0
+            while self.conn and (writes < 100) and (not self.obuf.empty()):
                 try:
+                    writes += 1
                     bytes = self.conn.write(self.obuf.peek())
                     if bytes > 0:
                         self.obuf.discard(bytes)
-                except socket.error:
-                    pass
+                except socket.error, err:
+                    if err.args[0] in (EWOULDBLOCK, EAGAIN, EINTR):
+                        pass
+                    else:
+                        self.disconnect()
+                        break
+                        
         finally:
             self.lock.release()
         return 0